Fixes #1281 - Needs to be tested on Windows 8