Closing this bug as the 22221 bug was the same as this one and that got fixed.

Thanks for the fix.