fix issue #614