Removed TODO comment, it's been solved