issue #20040: corrected source types