diff --git a/src/driver/0.14.x/treebuilder.vala b/src/driver/0.14.x/treebuilder.vala
index 4b86e6d..80c6a93 100644
--- a/src/driver/0.14.x/treebuilder.vala
+++ b/src/driver/0.14.x/treebuilder.vala
@@ -78,14 +78,11 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 
 			// find documentation comment if existing:
 			SourceComment? comment = null;
-			if (vns.source_reference != null) {
-				foreach (Vala.Comment c in vns.get_comments()) {
-					if (c.source_reference.file == vns.source_reference.file) {
-						Vala.SourceReference pos = c.source_reference;
-						comment = new SourceComment (c.content, file, pos.first_line, pos.first_column, pos.last_line, pos.last_column);
-						break;
-					}
-				}
+			Vala.List<Vala.Comment> vns_comments = vns.get_comments();
+			if(vns_comments.size > 0) {
+				var c = vns_comments[0];
+				var pos = c.source_reference;
+				comment = new SourceComment (c.content, file, pos.first_line, pos.first_column, pos.last_line, pos.last_column);
 			}
 
 			// find parent if existing