Small optim to solve lexing issue