Sword boxes fixed