Resolved a problem with some tokens