corretto bug in common::token