changes for latest on win machine