Added support for Windows XP clients