Order issues fixed