Got rid of a nasty switch