Fixed bug 1321345