20140426: Inelegant solution to FIB problem