Fixed an issue with ordering