Fix for mdm policies