yabf:yet another bug fixed