Also need to update the Win32 version.