fix #12
fix #14