fix #32
fix #58
fix #78