Corrected bug on unpacker