[4.0] Fix : Added backward-compatibility

No match.