Fix to Jira bug 107