Fix for bug #2270