Fix a bug of addressing