Multishot swithc fix