Fix for bug #2200.