Fixed endpoint build