fix bugs not merged in the origin