Fix for ACF >= 4.8.2