Fix for bug #2461