Fixed the previous fix on Windows