Fixed setting endpoint order