Fixing without_group assignment