TFs: FIX #2203 (second half)