ShapeKitFactory bug fix