Fix tokenizing