Bug fix for add-claim functionality