Fix to work on Win7