Bugfix: "ValueError: too many values to unpack"