fix #114
fix #113