Remove last of reflective thread safe issue