fix for race condition.
Merge branch 'master' of github.com:Su-per-b/LearnHPB-middleware