Fixed JIRA NSM-249