[RFR] prevent double entries (specific to version 4.2)