Fixed bug 1055