Fixed an ordering bug