Fix initial emptiness bug