yabf  (yet another bug fix)