Patch run on w2k3 too