Added a more robus fix for the blue/green swap