fixing issue #6 (empty tokens in tokens list)