Fix for Windows XP