Fixed unpacking bug