last changes on windows fixed