fix #55 #47