fix #12
fix #13