remoteURLs fix
merged