fix #25 #27