fixed JIRA-227