ordering fix attempt