Fixed bug 2701