Ladas, I think you had a fix for this? Or, were working on one. Can you share with Ryan how this can be fixed for the customer, and point to the PR that fixes this in the code base?