Yes, thanks for catching. I will add a TODO