Fixing the endpoint