Fixed issue ZEN-9840