fix package bugs
fix package bugs