Fixing 5,6,7 switch