Fix for issue #57