Fixed #617

Fixes #617