XD fix bug