Added TODO and fixed comment