Fix for bug #2549