nmu1: fixes upstream's #338494