Avoid bug: backward compatibility
[sync] 1.0.6.6