fix #5
fix #13