fixed issue when no address is present