[NTheEndAgain] Be more precise on XP given. Fix #126