Fixes claim owner detection