shape uncertainty fix