diff --git a/src/main/java/seng302/gameServer/MainServerThread.java b/src/main/java/seng302/gameServer/MainServerThread.java
index 6179b083..640715c6 100644
--- a/src/main/java/seng302/gameServer/MainServerThread.java
+++ b/src/main/java/seng302/gameServer/MainServerThread.java
@@ -200,6 +200,14 @@ public class MainServerThread extends Observable implements Runnable, ClientConn
             GeoPoint spawnMark = GeoUtility
                 .getGeoCoordinate(midpoint, perpendicularAngle, distanceApart * DISTANCEFACTOR);
 
+            if (yacht.getHeading() < perpendicularAngle) {
+                spawnMark = GeoUtility
+                    .getGeoCoordinate(spawnMark, perpendicularAngle + 90, DISTANCEFACTOR);
+            } else {
+                spawnMark = GeoUtility
+                    .getGeoCoordinate(spawnMark, perpendicularAngle + 270, DISTANCEFACTOR);
+            }
+
             yacht.setLocation(spawnMark);
             boatIndex++;
         }