Make if embedded logic consistent with StoreFieldManager