Break on switch bug fix