tokenise problem fixed