fix for GO_REF terms plus with/from fields