Another TODO fix. (Last one for today!)