Fix #617