add some fix