Rewrite unpack code in effort to fix bug