Fix issue #617