Feature/fix address issue