fix #10, #12