bugfix N_SE-21623