Fix for https://issues.apache.org/jira/browse/CB-4674

https://issues.apache.org/jira/browse/CB-4674