Fixed regression on Windows Platform