fix remote bug