Empty initial state bug fix