More careful checking when finding