fix #203
fix #212