Fixed loved ordering bug