fix #524