Retirement tax questions

Turbo tax did place the non-qualified pension amount on the other line on my federal return and not on the wages line.  However, when carried over to my MA state return it was put in 2 places...on the wages line and the other line, so now it's being double counted.  I guess I'll just over ride the wages line on my state return to match the federal return.