Jira CROSSDATA-118 fixed https://crossdata.atlassian.net/browse/CROSSDATA-118