find_before fix