BugFix.

One TODO down. 89 to go...