CAMEL-3223 Fix Submitted

[Mukundha Madhavan]

Hi,

I have attached the patch for CAMEL-3223 in jira. Kindly review and commit
if useful.

Thanks,
Mukundha