Fix use of basestring