Removed TODO, added reference to Issue