fixed #524