Fixed issue ZEN-11044