Worked around issue #3 on Windows.