Fix for issue #62