fix for bug 1490153