diff --git a/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java b/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java
index 38f0eb7db..7625e113a 100644
--- a/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java
+++ b/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java
@@ -489,8 +489,9 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
 		
 
 		//// Local wind speed and direction
-		Coordinate windSpeed = modelWindVelocity(status);
-		Coordinate airSpeed = status.getRocketVelocity().add(windSpeed);
+		Coordinate windVelocity = modelWindVelocity(status);
+		store.windSpeed = windVelocity.length();
+		Coordinate airSpeed = status.getRocketVelocity().add(windVelocity);
 		airSpeed = status.getRocketOrientationQuaternion().invRotate(airSpeed);