fixed addressing issue