diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/RotatingHandler.java b/mpmaster/src/main/java/com/xypower/mpmaster/RotatingHandler.java
index 864a8577..97d67942 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/RotatingHandler.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/RotatingHandler.java
@@ -77,19 +77,19 @@ public class RotatingHandler extends StreamHandler {
                 String extName = null;
                 int pos = fileName.lastIndexOf('.');
                 if (pos > 0) {
-                    baseName = fileName.substring(pos);
+                    baseName = fileName.substring(0, pos);
                     extName = fileName.substring(pos);
                 } else {
                     baseName = fileName;
                     extName = "";
                 }
 
-                String newFileName = fileName + "-" + str;
+                String newFileName = baseName + "-" + str;
                 File newFile = null;
                 int idx = 1;
                 do {
                     newFile = new File(parentFile, newFileName + extName);
-                    if (newFile.exists()) {
+                    if (!newFile.exists()) {
                         try {
                             file.renameTo(newFile);
                         } catch (Exception ex) {