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