fixed toggle issue for remote;