Possible fix for MDL-47333