Fixed a bug with TokenTypes