diff --git a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java
index 161efceba2d7..5e6c35c0fb66 100644
--- a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java
+++ b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java
@@ -176,11 +176,9 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
     for (JavaArrangementPropertyInfo propertyInfo : properties) {
       JavaElementArrangementEntry getter = propertyInfo.getGetter();
       List<JavaElementArrangementEntry> setters = propertyInfo.getSetters();
-      if (getter != null && !setters.isEmpty()) {
-        JavaElementArrangementEntry previous = setters.get(0);
-        previous.addDependency(getter);
-        for (int i = 1; i < setters.size(); i++) {
-          JavaElementArrangementEntry setter = setters.get(i);
+      if (getter != null) {
+        JavaElementArrangementEntry previous = getter;
+        for (JavaElementArrangementEntry setter: setters) {
           setter.addDependency(previous);
           previous = setter;
         }