diff --git a/network/src/main/java/seng302/Networking/MessageDecoders/BoatLocationDecoder.java b/network/src/main/java/seng302/Networking/MessageDecoders/BoatLocationDecoder.java
index b3e17945..2900cd42 100644
--- a/network/src/main/java/seng302/Networking/MessageDecoders/BoatLocationDecoder.java
+++ b/network/src/main/java/seng302/Networking/MessageDecoders/BoatLocationDecoder.java
@@ -95,9 +95,9 @@ public class BoatLocationDecoder {
             trueWindSpeed = Arrays.copyOfRange(encodedBoatLocation, 44, 46);
             numTrueWindSpeed = bytesToInt(trueWindSpeed);
             trueWindDirection = Arrays.copyOfRange(encodedBoatLocation, 46, 48);
-            numTrueWindDirection = bytesToShort(trueWindSpeed);
+            numTrueWindDirection = bytesToShort(trueWindDirection);
             trueWindAngle = Arrays.copyOfRange(encodedBoatLocation, 48, 50);
-            numTrueWindAngle = bytesToShort(trueWindSpeed);
+            numTrueWindAngle = bytesToShort(trueWindAngle);
             currentDrift = Arrays.copyOfRange(encodedBoatLocation, 50, 52);
             numCurrentDrift = bytesToInt(currentDrift);
             currentSet = Arrays.copyOfRange(encodedBoatLocation, 52, 54);