fixed address bug
tidy