Better location for switch warning enables to avoid a big shift (fixes #193)