Fix dummy switching (hopefully crashes as well)