Improved mode computation

No match.