I am having the same problem with 2021 1040X. It is pulling in the wrong values from the 1040. For example, it is pulling in line 9 (Total Income) and putting it the AGI line on 1040X. This is causing the wrong adjustment and not letting the tax amount reset to zero.
