Better Tokenizer Fix 05

Hopefully fixed the endless loop problem.