Slow fix for statistics