Add experimental fix for removing race condition during enqueueing