Fixing order ordering