Fix for bug #2354