Fix for issue #54