A simple fix is to input Boxes 52 and 53 on the second boxes - not in foreign income boxes. The two boxes add up to what is in Box 21 on the T3.
