bug 1124: Changed sorting order