Proposed race condition fix for *8129*