I can confirm the fix does resolve my original issue.