Fix for bug #2838