Add a todo item to make diagnosing the bug just fixed easier