diff --git a/acgateway/acgateway-1.1.1.mkp b/acgateway/acgateway-1.1.1.mkp
new file mode 100644
index 00000000..705ac248
Binary files /dev/null and b/acgateway/acgateway-1.1.1.mkp differ
diff --git a/acgateway/acgateway-1.1.mkp b/acgateway/acgateway-1.1.mkp
deleted file mode 100644
index d61fd95f..00000000
Binary files a/acgateway/acgateway-1.1.mkp and /dev/null differ
diff --git a/acgateway/lib/check_mk/base/plugins/agent_based/acgateway_sipperf.py b/acgateway/lib/check_mk/base/plugins/agent_based/acgateway_sipperf.py
index ea222468..a4c7141d 100644
--- a/acgateway/lib/check_mk/base/plugins/agent_based/acgateway_sipperf.py
+++ b/acgateway/lib/check_mk/base/plugins/agent_based/acgateway_sipperf.py
@@ -16,14 +16,12 @@
 # to the Free Software Foundation, Inc., 51 Franklin St,  Fifth Floor,
 # Boston, MA 02110-1301 USA.
 
-from .agent_based_api.v1 import (
+from cmk.base.plugins.agent_based.agent_based_api.v1 import (
     contains,
     get_rate,
     get_value_store,
     register,
-    render,
     Metric,
-    OIDEnd,
     Result,
     Service,
     SNMPTree,
@@ -72,7 +70,7 @@ def parse_acgateway_sipperf(string_table):
 )
 
 def discover_acgateway_sipperf(section):
-    if len(section) == 2:
+    if len(section) == 2 and len(section[0]) == 1 and len(section[1]) == 1:
         yield Service()
 
 def check_acgateway_sipperf(section):
diff --git a/acgateway/lib/check_mk/base/plugins/agent_based/acgateway_users.py b/acgateway/lib/check_mk/base/plugins/agent_based/acgateway_users.py
index 03bd4a7c..d93f3f3a 100644
--- a/acgateway/lib/check_mk/base/plugins/agent_based/acgateway_users.py
+++ b/acgateway/lib/check_mk/base/plugins/agent_based/acgateway_users.py
@@ -16,7 +16,7 @@
 # to the Free Software Foundation, Inc., 51 Franklin St,  Fifth Floor,
 # Boston, MA 02110-1301 USA.
 
-from .agent_based_api.v1 import (
+from cmk.base.plugins.agent_based.agent_based_api.v1 import (
     contains,
     get_rate,
     get_value_store,