Fixing issue where the composited id is not saved correctly into an indexed member set