diff --git a/java/src/main/java/com/genexus/internet/HttpRequestWeb.java b/java/src/main/java/com/genexus/internet/HttpRequestWeb.java
index ac2ddc532..938c2480e 100644
--- a/java/src/main/java/com/genexus/internet/HttpRequestWeb.java
+++ b/java/src/main/java/com/genexus/internet/HttpRequestWeb.java
@@ -18,13 +18,13 @@ public HttpRequestWeb(HttpContextWeb httpContext)
 	{	
 		super(httpContext);				
 	}
-	
-	public String getScriptName()
-	{
+
+	public String getScriptName() {
 		if (httpContext.getRequest() != null) {
-			String servletPath = httpContext.getRequest().getServletPath();
-			if (servletPath != null)
-				return servletPath.substring(servletPath.lastIndexOf("/") +1 , servletPath.length());
+			String requestURI = httpContext.getRequest().getRequestURI();
+			if (requestURI != null) {
+				return requestURI.substring(requestURI.lastIndexOf("/") + 1);
+			}
 		}
 		return "";
 	}