Fixed a bug where there's a ValueError: Too many value to unpack