fix #20 #12