fix issue #644