Fix bug : wrong backward compatibility
[sync] 0.7.0.4