Ubuntu fixes
_ removed throw( out_of_range )