Fixes HB for me, most probably for others too... (2)