reverted old f.id fix, added new