Fix FireSword