fixed store issues