fix issue #622