Naive fix for `Index` glitch