Fix case where there is no remote