Merge "Fix mad performance."