Oops... I made this fix a few commits ago but forgot to remove the TODO comment