Fixed XP  server backport.