We have the same issue on the switch. Any fix?