Backwards compatibility fix