fix since naf afs was switched off