Fixed: address_old_* tokens not working