fixed store_location bug