Fixed missing address problem