Fixing missing unpacking