Fix for bug #2318