Fixed ZEN-11838