Removed TODO (was fixed before)