Fixed: stopped trying to get fancy with switch()...