Fixed bug 2678, improve display.