Fix for bug #2654