Fixing unpack issue