Fixed for Windows 8.1