Fix for bug #2134