diff --git a/ComposableSqlFromClause.js b/ComposableSqlFromClause.js
index ca9afaa..4703c0f 100644
--- a/ComposableSqlFromClause.js
+++ b/ComposableSqlFromClause.js
@@ -74,18 +74,17 @@ function ComposableSqlFromClause (tables) {
 
 		// If there is one, join to the first column that
 		// has a foreign key to the table in this join.
-		// TODO: Rewrite with .find().
-		for (var i = 0; i < earlierColumnsWithForeignKey.length; i++) {
-			var column = earlierColumnsWithForeignKey[i];
-
-			if (column.foreignKey.table == join.table) {
+		var column = earlierColumnsWithForeignKey
+			.find(function (column) {
+				return column.foreignKey.table == join.table;
+			});
+		if (column) {
 
-				join.onExpression = new ComposableSqlEq(
-					join.table.columns[column.foreignKey.name],
-					column
-				);
-				return;
-			}
+			join.onExpression = new ComposableSqlEq(
+				join.table.columns[column.foreignKey.name],
+				column
+			);
+			return;
 		}
 
 		// Check if any of the columns in the table of this