Fixes initial state. Closes #35.