Fixed Win7 compatibility