diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java
index d74db46..c4d829f 100644
--- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java
+++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java
@@ -226,14 +226,13 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 					break;
 				}
 			}
-			if (childNode != null) {
+			if (childNode == null) {
+				HierNode newNode = new HierNode(name, node);
+				node.addChild(newNode);
+				node = newNode;
+			} else {
 				node = childNode;
-				break;
 			}
-			HierNode newNode = new HierNode(name, node);
-			node.addChild(newNode);
-			node = newNode;
-
 		}
 		node.addChild(waveform);
 		waveform.setParent(node);