diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataBranchHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataBranchHandler.java
index 8884cae8e..9641f13d6 100644
--- a/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataBranchHandler.java
+++ b/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataBranchHandler.java
@@ -148,12 +148,7 @@ class FlightDataBranchHandler extends AbstractElementHandler {
 			Rocket rocket = context.getOpenRocketDocument().getRocket();
 			sourceID = attributes.get("source");
 			if (sourceID != null) {
-				for (RocketComponent child : rocket.getAllChildren()) {
-					if (child.getID().equals(sourceID)) {
-						source = child;
-						break;
-					}
-				}
+				source = rocket.findComponent(sourceID);
 			}
 			
 			branch.addEvent(new FlightEvent(type, time, source));