change to improve operation on Windows