Fix for bug #2889