diff --git a/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Info.java b/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Info.java
index 4027ed8..833af62 100644
--- a/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Info.java
+++ b/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Info.java
@@ -17,10 +17,12 @@
 import java.util.Properties;
 
 public class Info extends HttpServlet {
+    HttpServlet servlet;
 
-    public void doGetHelper(HttpServletRequest request, HttpServletResponse response)
+    public void doGetHelper(HttpServletRequest request, HttpServletResponse response, HttpServlet httpservlet)
             throws IOException, ServletException {
-        String serverInfo = getServletContext().getServerInfo();
+        servlet = httpservlet;
+        String serverInfo = servlet.getServletContext().getServerInfo();
         try {
             //create info json object
             JSONObject json_info = new JSONObject();
@@ -66,7 +68,7 @@ public synchronized String getVersion(HttpServletRequest request) {
 
         // fallback to using Java API
         if (version == null) {
-            Package aPackage = getClass().getPackage();
+            Package aPackage = servlet.getClass().getPackage();
             if (aPackage != null) {
                 version = aPackage.getImplementationVersion();
                 if (version == null) {