the temporary work around had a flaw, this is a patch for the flaw.

(this is likely not to be the last update. This recent big push had a lot of deep and shallow changes so bugs are bound to be found and fixed asap..sorry in advance)