fix N_SE-12429 N_SE-13132 N_SE-13135