diff --git a/src/main/scala/net/psforever/actors/session/AvatarActor.scala b/src/main/scala/net/psforever/actors/session/AvatarActor.scala
index 565a39589..0889ce3a0 100644
--- a/src/main/scala/net/psforever/actors/session/AvatarActor.scala
+++ b/src/main/scala/net/psforever/actors/session/AvatarActor.scala
@@ -298,7 +298,7 @@ object AvatarActor {
               }
               val fireMode = tool.AmmoSlots(ammoSlots)
               fireMode.AmmoTypeIndex = ammoTypeIndex
-              fireMode.Box = AmmoBox(AmmoBoxDefinition(ammoBoxDefinition))
+              fireMode.Box = AmmoBox(DefinitionUtil.idToDefinition(ammoBoxDefinition).asInstanceOf[AmmoBoxDefinition])
               ammoCount.collect {
                 case count if restoreAmmo => fireMode.Magazine = count
               }