Fixes some issue in Windows 8.1.