Removed race condition