Fixed defect ZEN-12930