Fix control group again