Fix for pull request #243