fixing for bug 1330