[BUG #8117] Minor