Fixed JIRA NBIA-735.