Do not loose currentState if tokenizer uses combination of next and push

this is a modified version of #1556