Kaj's guienv drawSwitch hotfix hotfixed. I hacked a hack.