Fixed endpoint code