Fixed ZEN-2729 issue