provisional fix for issue #54