Removed race conditions