Fixed ZEN-11384