Replaced a TODO