diff --git a/libsecondlife/CapsToPacket.cs b/libsecondlife/CapsToPacket.cs
index 935fc0e7..3b8679ad 100644
--- a/libsecondlife/CapsToPacket.cs
+++ b/libsecondlife/CapsToPacket.cs
@@ -176,6 +176,10 @@ namespace libsecondlife.Packets
                         // Just need a bit of manual typecasting love here
                         field.SetValue(block, (byte)(int)blockData[field.Name]);
                     }
+                    else if (fieldType == typeof(short))
+                    {
+                        field.SetValue(block, (short)(int)blockData[field.Name]);
+                    }
                     else
                     {
                         field.SetValue(block, blockData[field.Name]);