fix #21 #17