fix bugs order +