fixed tokenisation in universal parser