fix / hack for issue #79