fix #528
fix #524