fix issue #638