fix issue#617

fix issue #617