Can you make a ticket for this? That would be easier to remember than a TODO line in the code. :)