fix #110
fix #103