Fix for CAMEL-7486