fix #214
fix #219