fix to jira APPM-155