Fix on Remote class