diff --git a/plugins/org.eclipse.actf.core/src/org/eclipse/actf/util/FileUtils.java b/plugins/org.eclipse.actf.core/src/org/eclipse/actf/util/FileUtils.java
index 0ee1274..c5ea8d4 100644
--- a/plugins/org.eclipse.actf.core/src/org/eclipse/actf/util/FileUtils.java
+++ b/plugins/org.eclipse.actf.core/src/org/eclipse/actf/util/FileUtils.java
@@ -81,14 +81,7 @@
 	 * @return replaced URL string
 	 */
 	public static String replaceWhiteSpaceInUrl(String target) {
-		StringBuffer tmpSB = new StringBuffer();
-		int i;
-		while ((i = target.indexOf("%20")) > -1) {
-			tmpSB.append(target.substring(0, i) + " ");
-			target = target.substring(i + 3);
-		}
-		tmpSB.append(target);
-		return (tmpSB.toString());
+		return target.replaceAll(" ", "%20");
 	}
 
 	/**