Fixes the mon_addresses refactor