fix #10
fix #5