ZEN-9036 bug fix