Fixed bug of recognizing tokens (previous commit)