Driver: Handle table fix for Win7