Fixed race condition and implemented delayed blocks retry