Author, here. This kills me too. I can’t wait to fix it.