[61606470] more0 fixs