Fixing MULE-7021