diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
index 24c5148798..e4ef11e91c 100644
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@ -363,9 +363,10 @@ string tempfile( const char* suffix )
 #endif
     if (*name == '\\')
         ++name;
+    string n(name);
     if (suffix != 0)
-        return string(buf) + suffix;
-    return buf;
+        n += (n[n.size()-1] == '.' && suffix[0] == '.' ? suffix + 1 : suffix);
+    return n;
 }
 
 static CvErrorCallback customErrorCallback = 0;