improve nn/goeswith UD compatibility