Fixing race condition

Shouldn't we move this under everlution?