Fix bug from previous checkin -- master_address should be my_master instead.