fixed addressing bug