fix for bug 1354579