Added fix to MDL-40225