Attempted fix for another Windows bug