fixed moves being visible during switch wait