fix for issue #54