Fix issue #622