tried to make the behaviour better match that of the NAPKIN database.