Fixed ZEN-10863 issue