Fix Too Many Values To Unpack bug