Since the check has now been added below, should this todo comment be removed?