fix #6
fix #5