be more defensive about remotes
3.2.1