Compatibility improvement