fix #47 , fix #48