diff --git a/Engine/source/T3D/shapeBase.cpp b/Engine/source/T3D/shapeBase.cpp
index 247b745d3..6f70e2760 100644
--- a/Engine/source/T3D/shapeBase.cpp
+++ b/Engine/source/T3D/shapeBase.cpp
@@ -803,8 +803,10 @@ void ShapeBaseData::packData(BitStream* stream)
    stream->write(shadowSphereAdjust);
 
 
-   stream->writeString(shapeName);
-   stream->writeString(shapeAsset.getAssetId());
+   //if (stream->writeFlag(shapeAsset.notNull()))
+      stream->writeString(shapeAsset.getAssetId());
+   //else
+      stream->writeString(shapeName);
 
    stream->writeString(cloakTexName);
    if(stream->writeFlag(mass != gShapeBaseDataProto.mass))
@@ -882,10 +884,11 @@ void ShapeBaseData::unpackData(BitStream* stream)
    stream->read(&shadowProjectionDistance);
    stream->read(&shadowSphereAdjust);
 
-   shapeName = stream->readSTString();
 
-   char buffer[256];
-   stream->readString(buffer);
+   //if (stream->readFlag())
+      shapeAssetId = stream->readSTString();
+   //else
+      shapeName = stream->readSTString();
 
    cloakTexName = stream->readSTString();
    if(stream->readFlag())