Corrected ZEN-11591 issue according to comments