Changes to fix a thread safe issue with the hit properties