Yep, this is the fix. I have applied it to several carts already.