Mode switch works again