diff --git a/api.go b/api.go
index 70a27da94..47558678d 100644
--- a/api.go
+++ b/api.go
@@ -2753,8 +2753,8 @@ func (api *API) RestoreShard(ctx context.Context, indexName string, shard uint64
 
 	for _, flv := range flvs {
 		fld := idx.field(flv.Field)
-		view, ok := fld.viewMap[flv.View]
-		if !ok {
+		view := fld.view(flv.View)
+		if view == nil {
 			view, err = fld.createViewIfNotExists(flv.View)
 			if err != nil {
 				return err
diff --git a/field.go b/field.go
index 2aa865a1f..d325c477e 100644
--- a/field.go
+++ b/field.go
@@ -705,8 +705,11 @@ func (f *Field) cacheBitDepth(bd uint64) error {
 	f.mu.Lock()
 	defer f.mu.Unlock()
 
-	f.options.BitDepth = bd
-	if bsig != nil {
+	if f.options.BitDepth < bd {
+		f.options.BitDepth = bd
+	}
+
+	if bsig != nil && bsig.BitDepth < bd {
 		bsig.BitDepth = bd
 	}
 
diff --git a/fragment.go b/fragment.go
index 9b77f90f7..8dfa6749c 100644
--- a/fragment.go
+++ b/fragment.go
@@ -218,6 +218,8 @@ func newFragment(holder *Holder, spec fragSpec, shard uint64, flags byte) *fragm
 func (f *fragment) cachePath() string { return f.path() + cacheExt }
 
 func (f *fragment) bitDepth() (uint64, error) {
+	f.mu.RLock()
+	defer f.mu.RUnlock()
 	tx, err := f.holder.BeginTx(false, f.idx, f.shard)
 	if err != nil {
 		return 0, errors.Wrapf(err, "beginning new tx(false, %s, %d)", f.index(), f.shard)
diff --git a/view.go b/view.go
index f3bd27b3a..5a8e23ae1 100644
--- a/view.go
+++ b/view.go
@@ -619,7 +619,9 @@ func (v *view) bitDepth(shards []uint64) (uint64, error) {
 	var maxBitDepth uint64
 
 	for _, shard := range shards {
+		v.mu.RLock()
 		frag, ok := v.fragments[shard]
+		v.mu.RUnlock()
 		if !ok || frag == nil {
 			continue
 		}