UPDATE: Removed TODO that has been fixed already