XD fix regression