Attempting ordering fix