diff --git a/TODO.md b/TODO.md
index 6e11d57..bb9cefa 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,6 +1,5 @@
 # TODO
 
-- [ ] Fix: Initial load `pointString` validation (make sure all talents are valid and their deps are met)
 - [ ] Fix: Tooltips cause horizontal scroll on less-wide screens. Investigate.
 
 - [ ] Responsiveness:
diff --git a/src/lib/tree.ts b/src/lib/tree.ts
index 168a3b8..c79cddb 100644
--- a/src/lib/tree.ts
+++ b/src/lib/tree.ts
@@ -241,9 +241,14 @@ export function decodeKnownTalents(pointString: string, classId: number): Map<nu
       if (points > talent.ranks.length) {
         break
       }
-      
-      if (points > 0) {
-        known = known.set(talent.id, points)
+
+      // Step through each point and see that we can assign it
+      for (let p = 0; p < points; p++) {
+        if (canLearnTalent(known, talent)) {
+          known = known.set(talent.id, p + 1)
+        } else {
+          break
+        }
       }
     }
   }