Don't add remote on every invocation