Possible fix for Windows hang bug