fix #617