Really fix the bug this time. Add TODO list.