Fixing CalculateAll()