Added a TODO statement about the temporary solution.