Fix issue with ordering.