aaf mapping fix