Fix for bug #2433