Magic unpacking fixed.