- half-baked fix for issue #79