Address edit bugfix