Bigfix to get the group mapping working