Fix for bug #2734