Fixed endpoint matching issue