really fix race condition

PR: 262
11 files changed