Temporary fix for race condition.