Fixed bug in old address implementation