Fix for initial stats generation