Update to make work on Windows