Fix for bug #2326