Fixed race condition (not really)
Merge remote-tracking branch 'origin/roughdraft'