Fix 'too many values to unpack' error in release branch