Fix for Issue N_SE-44235