Another TODO comment which should be easy to resolve. But why?