Fixed insertation rules for unpack