fix extra token errors