bug fix XD