MP1-4408 : Fix logic UNC detection