Hi Maxim,

> I've applied and tried your proposed fix, and it made shishi
> reproducible; so LGTM!  Could you apply your fix to core-updates?

Thanks for the test!

I've pushed the fix to core-updates.