fix for MDL-39833