Fixed issue ZEN-11424