fix issue #625