Remove race condition waiting for proper event instead of fixed time.