Fixed an ordering problem