Changed the checker on the tokens to only match beginning offset