Fixing bad remotes