2 files changed, 7 insertions, 1 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/tree/BlockNode.java b/theme-compiler/src/com/vaadin/sass/tree/BlockNode.java
index 3c87d3db82..5a64a928db 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/BlockNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/BlockNode.java
@@ -38,11 +38,13 @@ public class BlockNode extends Node implements IVariableNode, InterpolationNode
 
     public String toString(boolean indent) {
         StringBuilder string = new StringBuilder();
+        int i = 0;
         for (final String s : selectorList) {
             string.append(s);
-            if (selectorList.indexOf(s) != selectorList.size() - 1) {
+            if (i != selectorList.size() - 1) {
                 string.append(", ");
             }
+            i++;
         }
         string.append(" {\n");
         for (Node child : children) {
diff --git a/theme-compiler/tests/resources/basic/reindeer.css b/theme-compiler/tests/resources/basic/reindeer.css
index 22ca405982..af02070e72 100644
--- a/theme-compiler/tests/resources/basic/reindeer.css
+++ b/theme-compiler/tests/resources/basic/reindeer.css
@@ -830,6 +830,10 @@ div.v-app-loading {
 	width: 200px;
 }
 
+.v-app-loginpage .v-button, .v-app-loginpage .v-button {
+	float: left;
+}
+
 .v-menubar {
 	float: left;
 	white-space: nowrap;