Time to ditch cat-finder :(