YAFTMF

yet another fix to my fix of yncullmelater