Fix address bug