Fix address issue after last commit