Fixed #617