fixed #622