Yet another compatibility fix