fixed legacy store