Fix for bug #2319