diff --git a/core/src/net/sf/openrocket/rocketcomponent/FinSet.java b/core/src/net/sf/openrocket/rocketcomponent/FinSet.java
index d6ebb28c1..3a1e2035c 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FinSet.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FinSet.java
@@ -1159,7 +1159,7 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona
 
 		// correct last point, if beyond a rounding error from body's end.
 		final int lastIndex = points.length - 1;
-		if( body.getLength()-0.000001 < points[lastIndex].x) {
+		if (Math.abs(points[lastIndex].x - body.getLength()) < 0.000001) {
 			points[lastIndex] = points[lastIndex].setX(body.getLength()).setY(body.getAftRadius());
 		}
 
diff --git a/swing/src/net/sf/openrocket/gui/rocketfigure/FinSetShapes.java b/swing/src/net/sf/openrocket/gui/rocketfigure/FinSetShapes.java
index 29d98a266..b4ae59935 100644
--- a/swing/src/net/sf/openrocket/gui/rocketfigure/FinSetShapes.java
+++ b/swing/src/net/sf/openrocket/gui/rocketfigure/FinSetShapes.java
@@ -32,9 +32,9 @@ public class FinSetShapes extends RocketComponentShape {
 
         final Transformation compositeTransform = transformation.applyTransformation(cantRotation);
 		
-		Coordinate finPoints[] = finset.getFinPoints();
-        Coordinate tabPoints[] = finset.getTabPoints();
-        Coordinate rootPoints[] = finset.getRootPoints();
+		Coordinate[] finPoints = finset.getFinPoints();
+        Coordinate[] tabPoints = finset.getTabPoints();
+        Coordinate[] rootPoints = finset.getRootPoints();
 
 		// Translate & rotate points into place
         finPoints = compositeTransform.transform( finPoints );