Make sure initial_state is initialized
Merge pull request #5273 from jsdalton/fix_minor_wait_bug

Make sure initial_state is initialized