work on bug #8313.