fix race condition
v0.2b23