Fix for bug #2930