Fix issue with every char is a keyword