This technically need to lock some critical section. I know old code doesn't, so I don't require it in this pull. This is more as a reminder for somebody.