Compatibility fix