Fix for issue https://issues.apache.org/jira/browse/CB-3029?focusedCommentId=13647590&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13647590