Fix for windows client/node

Still untested so could break again :(