Updated bugfix for Windows