fix #13, fix #12