I think it's working now.

Also, you have to stand still for a couple seconds to put your guns away. This has cut down on random violence a LOT.