Fix for issue #63