Fix thread safety.. 1/..