fix #7 #8
fix #7 #8
fix #7 #8