Fixed bug 2613