Fix unpack issue from commit b599f82efb8bdaa0ad91fdf4bf07efe8b229c3a9