Fix for bug #2125