fix #8
fix #5