Fixed ZEN-11894