At least fix the group numbers