fixing war issues