Fixed state filtering
0.9.1a22