Amend Tax is not setting refund to 0 and causing incorrect refund

 I received a corrected 1099-DIV from my brokerage firm  after I filed the 2019 return (essentially reducing total ordinary dividends by 2K and increase total capital gains distribution by the corresponding 2K).   I waited till all the refunds (fed and state) were received before going back to TurboTax to amend my 2019 return.   However, instead of setting Fed and State refund amounts to $0, it left 5K in the Fed refund box when I started the amend process in TurboTax.   When I reviewed the 1040X form, it is not bringing the original Adjusted Gross Income either.    It seems to be adding 5K incorrected to the refund for the amended return.    Is this a bug in Turbotax?