ACF compatibility fix