Fixing MULE-7021

Can it be merge to bighorn?