Now handles properly multi-remotes