make things work with AFN v2