Fix fight invation ... still buggy