Fix for ZEN-9316 issue