Good point, we should avoid allowing shape changes if possible.