fixed JIRA223