TMP : Fix backward compatibility
[sync] v0.5.0.7