fix unpack tools