Fix for bug #2123.