Workaround for Windows 7