diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c
index aebdba13e6b..8f952f90566 100644
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -50,7 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
 extern const CLSID CLSID_DfMarshal;
 
 /* number of refs given out for normal marshaling */
-#define NORMALEXTREFS 1 /* FIXME: this should be 5, but we have to wait for IRemUnknown support first */
+#define NORMALEXTREFS 5
 
 /* private flag indicating that the caller does not want to notify the stub
  * when the proxy disconnects or is destroyed */
diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c
index 2f2e297f280..add724699c2 100644
--- a/dlls/ole32/stubmanager.c
+++ b/dlls/ole32/stubmanager.c
@@ -534,7 +534,7 @@ void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const
  
     if (ifstub->flags & MSHLFLAGS_TABLEWEAK)
         refs = 0;
-    else
+    else if (ifstub->flags & MSHLFLAGS_TABLESTRONG)
         refs = 1;
 
     stub_manager_ext_release(m, refs);