Ordering fix