Credit @bastik for zdf fix (#11063)