fixed bug in FSM; all token should be identified correctly now