New Mexico PIT-X not working

I am a new mexico non resident who is filing an amended federal return. All went well with modifying it except for the New Mexico State return. My change was to contribute to a HSA - no changes to my New Mexico based income. 

 

Form PIT-X is assessing nearly 20K in additional taxes on Line 18 than it should be. The problem appears to be that the proper tax shown on form PIT-B is not carrying over to Line 18 of PIT-X as it should be. 

 

Anyone else facing same issue with their amended New Mexico State return?