Fixed default model ordering