Fixed some address issue