Fix address setting