fix key store/recall to work with reset