Fix for pull request #19