Applied patch to token module.