Fix possible diplomacy bug