fix issue #648