Speculative fix for Windows