fixing tokenizing