Fix for issue N_SE-41952