Bug fix, stats crashing the system