SNMPv1 issues: duplicate hosts entries with NAT

Hi, I have NAT-ed SNMPv1 and v2 Traps that are coming to the OpenNMS, everything is fine with SNMPv2, however I got issue with SNMPv1 Traps, where payload contains real host IP address. And OpenNMS creates two entries in Node list, for NATed IP and for IP extracted from SNMPv1 payload.

Host IP address: 172.16.0.10
NATED IP address: 10.16.0.10

With SNMPv2 I have only one node in node list: 10.16.0.10 ; GETs and TRAPs are stored under one node.
However with SNMPv1, I have two nodes: 172.16.0.10 and 10.16.0.10, where traps are stored under: 172.16.0.10 and GETs under 10.16.0.10

How to configure OpenNMS to look on packed header only, but not on packet payload?

Thx in advance