fixed pull request #617