TrimSwitch Fix