stylesheets/flint/mixins/lib/_flint-calculate.scss in flint-gs-1.0.0 vs stylesheets/flint/mixins/lib/_flint-calculate.scss in flint-gs-1.0.1

@@ -140,10 +140,10 @@
 					}
 					// Output styles normally if not set to auto
 				} @else {
 
 					$outputWidth: (calc-width($calcKey, $calcSpan, $calcContext)) - ((calc-margin($calcKey, $calcSpan, $calcContext))*2);
-					$outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)));
+					$outputMarginRight: calc-margin($calcKey, $calcSpan, $calcContext);
 					$outputMarginLeft: ( if( $calcShift > 0, 
 						(calc-margin($calcKey, $calcSpan, $calcContext)) + (calc-width($calcKey, $calcShift, $calcContext)),
 						(calc-margin($calcKey, -$calcSpan, $calcContext)) + (calc-width($calcKey, $calcShift, $calcContext)) 
 					));
 
\ No newline at end of file