closes #329, remove state change in initial sync
Merge branch 'bugs/329'