Fix a problem b/w TokenBuffer, new dup checking in core