Fix fro pull request #448