Fix for issue #65