Fix for bug 3769