More robust workaround for WM_TOUCH bug