Fixing back compatibility issue which affect extensions.