Try to avoid some locking issues.