Committing fix for MULE-7566
Merge pull request #666 from jsaliba/MULE-7566

Committing fix for MULE-7566