Manual fix to issue#287 for Hironx.