diff --git a/include/class_template.inc b/include/class_template.inc
index 7e82bbce5d75a6cf07d3b6c763b585960b2867af..ab89857c9421f53c12e2e79b88d6af9f4758f7fd 100644
--- a/include/class_template.inc
+++ b/include/class_template.inc
@@ -352,7 +352,7 @@ class template
       $specialAttrs['caller'.strtoupper($attr)] = $ui->$attr;
     }
     $this->attrs = templateHandling::parseArray($this->attrs, $specialAttrs, $targetdn);
-    $this->tabObject->adapt_from_template($this->attrs, array_merge(...array_values($this->attributes)));
+    $this->tabObject->adapt_from_template($this->attrs, array_merge([], ...array_values($this->attributes)));
 
     $this->applied = TRUE;
     return $this->tabObject;
diff --git a/include/simpleplugin/class_simpleTabs.inc b/include/simpleplugin/class_simpleTabs.inc
index f02ba47f14b03a8f38859c51ca043f9e2548bf3d..b841681157b851e1d1b48221b6c16c716ac314d8 100644
--- a/include/simpleplugin/class_simpleTabs.inc
+++ b/include/simpleplugin/class_simpleTabs.inc
@@ -457,7 +457,7 @@ class simpleTabs
    * \param array $attrs an LDAP-like values array
    * \param array $skip Attributes to skip
    */
-  function adapt_from_template ($attrs, $skip = [])
+  function adapt_from_template (array $attrs, array $skip = [])
   {
     foreach ($this->by_object as $key => &$obj) {
       logging::debug(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, "Adapting");