I guess this TODO can be removed