Fix Anna issue with switch