changed handling of addr_store