Corrected ZEN-11585 issue