Fixed bug where address may not be resolved