Bug fix set claimType