fix of #78,#77