Working on recognition bug for tokens