Further improvement to thread safety!