Last fix todo.

It's almost working. Just need to fix one last thing...