diff --git a/java/src/org/apache/xml/resolver/Catalog.java b/java/src/org/apache/xml/resolver/Catalog.java
index 6c5a5c6..e731958 100644
--- a/java/src/org/apache/xml/resolver/Catalog.java
+++ b/java/src/org/apache/xml/resolver/Catalog.java
@@ -1746,11 +1746,11 @@ public class Catalog {
 	  }
 	}
       }
+    }
 
-      if (prefix != null) {
-	// return the systemId with the new prefix
-	return prefix + systemId.substring(startString.length());
-      }
+    if (prefix != null) {
+      // return the systemId with the new prefix
+      return prefix + systemId.substring(startString.length());
     }
 
     // If there's a DELEGATE_SYSTEM entry in this catalog, use it
@@ -1878,11 +1878,11 @@ public class Catalog {
 	  }
 	}
       }
+    }
 
-      if (prefix != null) {
-	// return the systemId with the new prefix
-	return prefix + uri.substring(startString.length());
-      }
+    if (prefix != null) {
+      // return the systemId with the new prefix
+      return prefix + uri.substring(startString.length());
     }
 
     // If there's a DELEGATE_URI entry in this catalog, use it