Get your taxes done using TurboTax

It is form 8834 that is the problem not 8936.

TurboTax 2019 Mac Desktop