fix #12
fix #8