update the package per issue #3710 and issue #3821