Fixed XP issue