Fixed with weapon boxes