Fix for bug #2688