Fixed defect ZEN-13190