Fixed usage of basestring