Release22 bug hot fix