Adding workaround for tuple unpacking bug in EDG