fix for bug 1147