Fixed bug where a string was not wrapped in a TypeVar constructor