fix package object + optimization