[Tak] switch bug fixed