I think this needs to be fixed wrt the other PR.