Fix for bug #2888