Fixing MULE-7108