Added remote flag again