Fix green switching