fixing token type ahead