Investors & landlords

Form 8960 bases the 3.8 additional tax on modified adjusted gross income which includes social security which I don't think should be treated as investment income.  TT computes the investment income which is correct but then under Part 111 puts in magi which is incorrect???