Experimental fix for battle links