Fixed bug with HW_Addresses