fix issue #658