fixed race conditions on init
0.0.9