Tried to fix the xp bug.