temporary fix for issue #45