Fix CAMEL-8065