Fixed an ordering issue