token fix, diff empty fix