Fix race condition bug
release 0.5.15