Issue #2145003: wrap with check_plain() just to make sure