fix bugs order