fix N_SE-11026, 11017, 10424, 7981