try to fix problem with tokens