fix on token stripping