Auto collapse improvement for ACF 5