Fixed find up better