minor change to handle token better