fix #27 #26