Workaround for issue #16315

Workaround for issue #16315 until i figure out where the race condition is.