@APeters I have never heard of filing on the wrong form. That doesn't sound compliant with IRS rules. If the income has to be on 8915-F then it has to be on 8915-F.
