new fix bugs