ordering fix