Fixing XP mode