Another ordering fix