Fixed bug 2917