LPS-49552 fix other finders with the same problem