Win7 bug fix