Updated to solve bug on Windows