Fixed for Windows 7 x64.