Empty Address fixed