Fix #1561 - 'afv' working again