Fixing jira issue 1163

2 files changed