Fixed issue #2646: Library broken in Windows 10