final fix, everything seems to be working for abf1 and abf2