Package changes to fix a bug