fix #10, #2