Add hack to remain compatible with 2311