YABF : Yet another bug fix.