Address format fix