Fixed issue with tokenising