Fixed bug 2285