diff --git a/opal/util/basename.c b/opal/util/basename.c
index 0b9378f87c..a7e8ee061a 100644
--- a/opal/util/basename.c
+++ b/opal/util/basename.c
@@ -121,12 +121,21 @@ char *opal_basename(const char *filename)
     /* Look for the final sep */
 
     ret = strrchr(tmp, sep);
+#ifdef __WINDOWS__
+    /**
+	 * As on Windows we support both separators (/ and \) we should double
+	 * check or both of them.
+	 */
+	if( NULL == ret ) {
+	    ret = strrchr(tmp, '/');
+	}
+#endif  /* __WINDOWS__ */
     if (NULL == ret) {
         return tmp;
     }
     ret = strdup(ret + 1);
     free(tmp);
-    return opal_make_filename_os_friendly(ret);
+    return ret;
 }
 
 char* opal_dirname(const char* filename)