diff --git a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
index af7c0aa74ea..e5a44815bb9 100644
--- a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
@@ -559,12 +559,10 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
     private void renderClass(@NotNull ClassDescriptor klass, @NotNull StringBuilder builder) {
         boolean classObject = klass.getKind() == ClassKind.CLASS_OBJECT;
         if (!startFromName) {
-            if (!classObject) {
-                renderAnnotations(klass, builder);
-                renderVisibility(klass.getVisibility(), builder);
-                if (klass.getKind() != ClassKind.TRAIT && klass.getKind() != ClassKind.OBJECT) {
-                    renderModality(klass.getModality(), builder);
-                }
+            renderAnnotations(klass, builder);
+            renderVisibility(klass.getVisibility(), builder);
+            if (klass.getKind() != ClassKind.TRAIT && !klass.getKind().isObject()) {
+                renderModality(klass.getModality(), builder);
             }
             builder.append(renderKeyword(getClassKindPrefix(klass)));
             if (!classObject) {
diff --git a/compiler/testData/lazyResolve/descriptorRenderer/ClassObject.kt b/compiler/testData/lazyResolve/descriptorRenderer/ClassObject.kt
index cd0adfa1600..ae55604ed68 100644
--- a/compiler/testData/lazyResolve/descriptorRenderer/ClassObject.kt
+++ b/compiler/testData/lazyResolve/descriptorRenderer/ClassObject.kt
@@ -4,5 +4,5 @@ trait TheTrait {
 }
 
 //internal trait TheTrait defined in root package
-//class object defined in TheTrait
+//internal class object defined in TheTrait
 //private constructor <class-object-for-TheTrait>() defined in TheTrait.<class-object-for-TheTrait>
\ No newline at end of file
diff --git a/compiler/testData/renderer/Classes.kt b/compiler/testData/renderer/Classes.kt
index d53897c5b89..a49fe87ad17 100644
--- a/compiler/testData/renderer/Classes.kt
+++ b/compiler/testData/renderer/Classes.kt
@@ -44,7 +44,7 @@ public trait TwoUpperBounds<T> where T: Number, T: Any
 //public constructor InternalClass() defined in rendererTest.InternalClass
 //internal trait TheTrait defined in rendererTest
 //internal abstract fun abstractFun() : Unit defined in rendererTest.TheTrait
-//class object : rendererTest.TheClass<jet.Int, jet.Int> defined in rendererTest.TheTrait
+//internal class object : rendererTest.TheClass<jet.Int, jet.Int> defined in rendererTest.TheTrait
 //private constructor <class-object-for-TheTrait>() defined in rendererTest.TheTrait.<class-object-for-TheTrait>
 //internal final fun classObjectFunction() : jet.Int defined in rendererTest.TheTrait.<class-object-for-TheTrait>
 //public final class WithReified<reified A, reified out B> defined in rendererTest
diff --git a/compiler/testData/renderer/Enum.kt b/compiler/testData/renderer/Enum.kt
index 50d1a1be61a..54b4e5cda45 100644
--- a/compiler/testData/renderer/Enum.kt
+++ b/compiler/testData/renderer/Enum.kt
@@ -8,6 +8,6 @@ private enum class TheEnum(val rgb : Int) {
 //private final enum class TheEnum : jet.Enum<rendererTest.TheEnum> defined in rendererTest
 //private constructor TheEnum(rgb : jet.Int) defined in rendererTest.TheEnum
 //value-parameter val rgb : jet.Int defined in rendererTest.TheEnum.<init>
-//private final enum entry VAL1 : rendererTest.TheEnum defined in rendererTest.TheEnum.<class-object-for-TheEnum>
+//private enum entry VAL1 : rendererTest.TheEnum defined in rendererTest.TheEnum.<class-object-for-TheEnum>
 //private constructor VAL1() defined in rendererTest.TheEnum.<class-object-for-TheEnum>.VAL1
 //public final val VAL1 : rendererTest.TheEnum defined in rendererTest.TheEnum.<class-object-for-TheEnum>
\ No newline at end of file
diff --git a/idea/testData/libraries/decompiled/Color.kt b/idea/testData/libraries/decompiled/Color.kt
index 424888c3e06..aea14443290 100644
--- a/idea/testData/libraries/decompiled/Color.kt
+++ b/idea/testData/libraries/decompiled/Color.kt
@@ -4,7 +4,7 @@
 package testData.libraries
 
 [[public final enum class Color(rgb : jet.Int) : jet.Enum<testData.libraries.Color> {
-    class object {
+    public class object {
         [public final val BLUE : testData.libraries.Color] /* compiled code */
 
         [public final val GREEN : testData.libraries.Color] /* compiled code */
diff --git a/idea/testData/libraries/decompiled/WithInnerAndObject.kt b/idea/testData/libraries/decompiled/WithInnerAndObject.kt
index c2793247c33..5e348d5c960 100644
--- a/idea/testData/libraries/decompiled/WithInnerAndObject.kt
+++ b/idea/testData/libraries/decompiled/WithInnerAndObject.kt
@@ -4,7 +4,7 @@
 package testData.libraries
 
 [[public final class WithInnerAndObject() {
-    class object {
+    public class object {
         [internal final fun foo() : Unit { /* compiled code */ }]
     }
 
diff --git a/idea/testData/libraries/decompiled/WithTraitClassObject.kt b/idea/testData/libraries/decompiled/WithTraitClassObject.kt
index 8338b476e77..114e9cef747 100644
--- a/idea/testData/libraries/decompiled/WithTraitClassObject.kt
+++ b/idea/testData/libraries/decompiled/WithTraitClassObject.kt
@@ -4,6 +4,6 @@
 package testData.libraries
 
 [[public final class WithTraitClassObject() {
-    class object : testData.libraries.SimpleTrait {
+    public class object : testData.libraries.SimpleTrait {
     }
 }]]