Another compatibility fix