Fixed #608

Since no pull request was opened, I've created a commit for the fix