Thread safety improvement!