Try to fix ACF issue again...