I think we can remove this TODO