Fix for ADDR-REUSE