Another shot at Windows fix...