some fix of code