diff --git a/cucumber-java/src/org/jetbrains/plugins/cucumber/java/CucumberJavaUtil.java b/cucumber-java/src/org/jetbrains/plugins/cucumber/java/CucumberJavaUtil.java
index 384a81a82a1..ca8220642a7 100644
--- a/cucumber-java/src/org/jetbrains/plugins/cucumber/java/CucumberJavaUtil.java
+++ b/cucumber-java/src/org/jetbrains/plugins/cucumber/java/CucumberJavaUtil.java
@@ -99,7 +99,7 @@ private static String getCucumberAnnotationSuffix(@NotNull String name) {
   public static String getCucumberPendingExceptionFqn(@NotNull final PsiElement context) {
     final String version = CucumberConfigUtil.getCucumberCoreVersion(context);
     if (version == null || version.compareTo(CucumberConfigUtil.CUCUMBER_VERSION_1_1) >= 0) {
-      return "cucumber.api.PendingException";
+			return "io.cucumber.java.PendingException";
     }
     return "cucumber.runtime.PendingException";
   }
diff --git a/cucumber-java/src/org/jetbrains/plugins/cucumber/java/steps/JavaSnippet.java b/cucumber-java/src/org/jetbrains/plugins/cucumber/java/steps/JavaSnippet.java
index 853eec96611..0db0a10ddec 100644
--- a/cucumber-java/src/org/jetbrains/plugins/cucumber/java/steps/JavaSnippet.java
+++ b/cucumber-java/src/org/jetbrains/plugins/cucumber/java/steps/JavaSnippet.java
@@ -27,7 +27,7 @@ protected String getArgType(Class<?> arg) {
 
   @Override
   public String template() {
-    return "@{0}(\"{1}\")\npublic void {2}({3}) throws Throwable '{'\n    // {4}\n{5}    throw new PendingException();\n'}'\n";
+    return "@{0}(\"{1}\")\npublic void {2}({3}) throws Throwable '{'\n  {4}\n{5}    throw new PendingException();\n'}'\n";
   }
 
   @Override
@@ -49,4 +49,4 @@ public String namedGroupEnd() {
   public String escapePattern(String pattern) {
     return pattern.replace("\\", "\\\\").replace("\"", "\\\"");
   }
-}
\ No newline at end of file
+}