Fix bug in Toolkit.unpack*