Edit to ordering fix