fix #21 #22