A more clever solid implementation to fix the race condition found in 463c1c14ab79e82578b48d371e7e1f194c5e4f19.
We now delay a checkState() call if find the condition to occur.