Index: spoke.c
===================================================================
--- spoke.c	(revision 18481)
+++ spoke.c	(revision 18482)
@@ -111,7 +111,6 @@
 			spacing += conf_core.design.bloat;
 			spacing += ((ewire_t *) (sp->slots.array[i]))->wire->thickness;
 		}
-		spacing += conf_core.design.bloat;
 		if (bloat < 0)
 			spacing += (((ewire_t *) (sp->slots.array[vtp0_len(&sp->slots) - 1]))->wire->thickness + 1)/2;
 		else
@@ -118,8 +117,10 @@
 			spacing += ((ewire_t *) (sp->slots.array[vtp0_len(&sp->slots) - 1]))->wire->thickness;
 	}
 
-	if (bloat >= 0)
+	if (bloat >= 0) {
+		spacing += conf_core.design.bloat;
 		spacing += bloat;
+	}
 
 	spoke_pos(sp, spacing, x, y);
 }