Fixes HB for me, most probably for others too...

...hopefully. Revert at will.