Hopefully fixed for Windows