#74 fixed addresses