Added token fix