Fix to make sure FN is set on the object model