fixed correct switches