Bug -- race condition eliminated