Feature #8725: Minor improvement