Fix for race condition Mitch is experiencing?