Fix control groups