yeah.

Couple of PRs and you have been cringing over this.  Now I know how to give you sleepless nights :)