fixed a bug that missing unpackaging and improve performance of it