Fixed for Windows stability