fix #619

and the package as well