Fixed address bug