Fixed bug 1652