temporary fix for issue #54