Fix field groups