Fix for Windows 7