Compatibility up to 4.0