diff --git a/hera-core/src/main/java/org/synyx/hera/core/PluginRegistry.java b/hera-core/src/main/java/org/synyx/hera/core/PluginRegistry.java
index 00a7009..259e87d 100644
--- a/hera-core/src/main/java/org/synyx/hera/core/PluginRegistry.java
+++ b/hera-core/src/main/java/org/synyx/hera/core/PluginRegistry.java
@@ -51,7 +51,7 @@ public class PluginRegistry<T extends Plugin<S>, S> implements Iterable<T> {
      * @param <S>
      * @return
      */
-    public static <T extends Plugin<S>, S> PluginRegistry<T, S> create() {
+    public static <S, T extends Plugin<S>> PluginRegistry<T, S> create() {
 
         return new PluginRegistry<T, S>();
     }
diff --git a/hera-core/src/test/java/org/synyx/hera/core/SamplePluginHost.java b/hera-core/src/test/java/org/synyx/hera/core/SamplePluginHost.java
index 6fa37da..c85c2e2 100644
--- a/hera-core/src/test/java/org/synyx/hera/core/SamplePluginHost.java
+++ b/hera-core/src/test/java/org/synyx/hera/core/SamplePluginHost.java
@@ -6,7 +6,7 @@ package org.synyx.hera.core;
 public class SamplePluginHost {
 
     private PluginRegistry<SamplePlugin, String> registry =
-            new PluginRegistry<SamplePlugin, String>();
+            PluginRegistry.create();
 
 
     /**