Issue #8082 by tuj: Fixed texts