fix #15 #10