add FIXME re closing the store