diff --git a/src/org/jetbrains/jet/j2k/ast/Trait.java b/src/org/jetbrains/jet/j2k/ast/Trait.java
index 7a373d74828..c9a580383ff 100644
--- a/src/org/jetbrains/jet/j2k/ast/Trait.java
+++ b/src/org/jetbrains/jet/j2k/ast/Trait.java
@@ -19,12 +19,6 @@ public class Trait extends Class {
     return false;
   }
 
-  String bodyToKotlin() {
-    return AstUtil.joinNodes(myFields, N) + N +
-      AstUtil.joinNodes(methodsExceptConstructors(), N) + N +
-      AstUtil.joinNodes(myInnerClasses, N) + N;
-  }
-
   @NotNull
   @Override
   public Kind getKind() {
diff --git a/test/org/jetbrains/jet/j2k/ast/ClassTest.java b/test/org/jetbrains/jet/j2k/ast/ClassTest.java
index 7218f8d95ab..907183b84eb 100644
--- a/test/org/jetbrains/jet/j2k/ast/ClassTest.java
+++ b/test/org/jetbrains/jet/j2k/ast/ClassTest.java
@@ -142,4 +142,11 @@ public class ClassTest extends JetTestCaseBase {
       "class S { class object { var myI : Int = 10 } fun sB() : Boolean { return true } }"
     );
   }
-}
+
+  public void testInnerStaticClass() throws Exception {
+    Assert.assertEquals(
+      classToSingleLineKotlin("final class S { static class Inner {} }"),
+      "class S { class object { open class Inner { } } }"
+    );
+  }
+}
\ No newline at end of file
diff --git a/test/org/jetbrains/jet/j2k/ast/TraitTest.java b/test/org/jetbrains/jet/j2k/ast/TraitTest.java
index da081b9102b..03966099193 100644
--- a/test/org/jetbrains/jet/j2k/ast/TraitTest.java
+++ b/test/org/jetbrains/jet/j2k/ast/TraitTest.java
@@ -36,9 +36,11 @@ public class TraitTest extends JetTestCaseBase {
         "}"
     ),
       "trait INode {\n" +
+        "class object {\n" +
         "public val IN : String? = \"in\"\n" +
         "public val AT : String? = \"@\"\n" +
         "public val COMMA_WITH_SPACE : String? = (COMMA + SPACE)\n" +
+        "}\n" +
         "}"
     );
   }
@@ -82,9 +84,11 @@ public class TraitTest extends JetTestCaseBase {
         "}"
     ),
       "public trait INode {\n" +
+        "class object {\n" +
         "public val IN : String? = \"in\"\n" +
         "public val AT : String? = \"@\"\n" +
         "public val COMMA_WITH_SPACE : String? = (COMMA + SPACE)\n" +
+        "}\n" +
         "}"
     );
   }