Fix for bug #2609