ShapePanel bug fix