Avoid generation of multiple tokens #239