Fix addresses issue