fix #19 #13