Fixing JIRA issue N_SE-30325.