fix for CAMEL-7883