Fix firing order
0.0.7