fixed race condition bug
v1.4.1