fixed up stupid if in tokeniser