Bug fix for duplicate claims