fix #220
fix #222