Fix zap
regression introduced in 6500fa1; ref #21583
#21607
Merged
zap
regression introduced in 6500fa1; ref #21583
#21607