Win 8.1 fix