Fixed missing addresses