change some fix