fix unpack builder error on clean-up