Eliminated race condition