Fixed bug with empty tokens