fix None manipulation if no element found