Fixing remove addr issue.