fixed state order
0.3.4