inherited token fix