Fix for GitHub Goby issue 3.