One last attempt at increasing wait time to avoid race conditions