Fixing for Windows XP support